Fixed some compilation issues
Fixed remaining compiler errors