Minor initialization changes