Fix last? bugs