Better file assoc handling