General fixes
General fixes