small in-hurry fixes