Fix wrong callbacks in containers