Fix a couple of issues in bitbase.cpp