Fixed some of issues caused by operation refactor