Attempt to clean up stalemate
Fix freeze dodging