Removed some compiler warnings/errors