Couple tab completion fixes, time to pass out