Little bits of fixes and things