Misc fixes

too high, should be 20