coupla fixes