Fix misc. compilation issues.