Speed up instance loading time
minor changes