fixes for subfolder usage