Various fixes

n/a