Fixed compile errors

Due to other component changes