Eliminating security warnings
Redoing cast warning after merge