Quick cleanup/fix