Core: Fix build and some fails