Fixed: Typo in error pages + CS fixes