Small fixes to prevent exploiting