Fixed issue with warnings