Issues #252 - #291 Fixes