Make things more proper