Additional bug fixes 5th Nov