Fixed analyzer errors