Next fixes for the 1064 error issue