Additional compile fixes