Some more work on Quest-related stuff