More tetris fixes