fix bugs

https://obsproject.com/mantis/view.php?id=83
ttps://obsproject.com/mantis/view.php?id=82
This should not be necessary to store or use.