Small unimportant fixes