Issues

Minor issue and their fixes

Request Feature / Report Bug