v1245 Bug fixes