fixes and ops