Resolved issues brought to attention by @tivnet