ofsoftswitch13: 242bc55 Various bug fixes.