Minor adjutments
Fix