Fixes / Keiths suggestions