Fixed arrow issues