Fixed minor changes. Ready for merge