Ported more things [skip ci]