Other compile fixes