some unimportant fixes