small issue fixes