Fix some grabby problems