Fix issues with fasd