Fixed unused vars