Fix a coupla bugs leftover