- fixed compilation issues