Fix some coding