Fix quick

Fixes for Issues #196 and #174.
Fixed R CMD check issues.