Sorted a few little things out