GH-21: Fix some compiler warnings