Merge floks compilation fixes. Closes #3