#1103 Attempt to fix warnings