General fixes

not sure what.