minor bugs fixes to make deployment easier