Fix build (Last 3 commits)