Fixing some annoynaces