Adapting to libcore part 2