fixes for our own libcore