Fixes for issues reported from UNSW prod