Minor changes before file browser implementation