Minor fixes, pushing out of paranioa