Two compile fixes needed for my project