Compile fixes from previous commits