after build fixes