Fixing annoying stuff