Various mini-fixes