some fixes for more convenience;