Fixed misc compile errors - several remaining