Core fixes