fixed - compilation issues