fixes for isolated devel spaces