Fixed a few things

Minor problems fixed