Implementing schilit's recommended fixes