Minor compile fixes