Fix issues

sync for the latest fixes