Fix build errors, due to moving main.