fixes due to issues with startup configuration