Last minute bug fixes for testing group 1