Version 2.0b fixes