A few fixes for faup options