Small improvements, including using fs_path instead of fs_url