Make these a bit more correct