Made a start on fixing glue bugs