Few minor fixes
Pull and fix merge conflict from Ryan F awesome work