Oops, more function fixes