1.9.7-rc5 several issues