Fix small but annoying bugs