Making fixes as per @mseckingtons request