Fix warnings

Some warning fixes.