More fixes and methods.