Dev Some minor fixes