Fixes for escapes. Totally premature...