Removed some compiler errors