Several bux fixed