Fixed build failures in core/main.mk