Prevent out of index on callback; misc changes