Additional cast warnings resolved