compilation issue fixes