Fixes for issues reported by UNSW