Fixes for two show stoppers