Clean up

Clean-up of small issues