Fixed 2 bugs from GT: