fixes for initial push