Bug fixes Level 4