Bug fixes for oneways