BeFixed some unused vars