Last batch of fixes (I hope!)