Fixing broken stuff :)