fixes for issues