more bug fixes

Trying to get backwards compatibility restored