Fixing member variables, static final stuff