Fix little things bothering me