A few small changes to remove warnings when building package