Core: fix CS for haiku