container and panic fixes