Minor fixes
Initial operator