issue fixes

issue fixes