Minor fixes. - Finished