Coverage fixes, bug fixes