Fixes suggested by DraymondDarksteel