Just some minor changes and fixes