Changes re: Dev feedback