Deactivated some expensive error checks