Some more changes... Still far enough for successful build