Minor changes - breaks and such