Make some casts friendly to javac
Fix data hiding bug