fixes for initial working environment