Minor buh fixes