Minor fixes and more escapes