First minor fixes

Fixed or at least helped the few issues from my issue tracker.