Fix small stupid bugs