Fixed 1.5 bugs