Minor changes for faster (default) FIT execution