some fixes for operations