bug fixes for forcing encryption