Fixed following issues