Fixes for f# project