Fixed compile problem in core module
Fixed minor problems with the platform