small issue fixes

small issue fixes