Fix oneway errors