fixes for includes mostly