Minor bug fixes for CLUSTOF