Make these behave better outside of the container