small pre-production fixes