[fs] Cleanups
[*] Many changes to keep up with recent qtdeclarative updates