Fixes and new operations