fixes on ready for faceless