Invincible Fins: Minor bug fixes

Minor bug fixes - Reduce memory footprint