Fixed some compilagtion errors