fixed issues with compilation