Core: Small modifications