Adding in fixes to minutes as well as location support