fixes for subfolder installations