fixing casting errors
merge errors fixed