Core fixes!