Misc: small improvements