Various fixes

A few more random fixes and updates.