sever: minnor bug fixes