Register and other minor changes