Fixing some ugly things