Remove bad argument + small fixes