Fixed some minor changes that where deleted on the merge