Bug Fixes

Some simple, small bugfixes