Small behavior improvements