Oops! Small bugs fixed