More changes due to new code convention