Level 2.9, various fixes