Fix all current build errors