Little compile fixes