Fix some of the key errors

Still partially broken