Some compile fixes