some fixes for my latest changes