A few fixes and things