Changed a couple of things towards 5510 compilation