A couple of bugs have been fixed