fixes for our own system_core