Minor fixes and tune-ups