Minor fixes and tests