Small fixes

Done changes based on comments.