Code syntax fixes