Fixed build errors again!