Pushing minor bu fixes