Fixing build errors in last update