Issue fixes

Merge fc pull request https://github.com/InvictusInnovations/fc/pull/23 before merging this.