More little stuff to fix