* fixed compilation issues