Fixes and more includes