Some paranoia and a few fixes