A few fixes, minor things