Fix "stuck" problems