Other fixes

Other fixes