Tiny fixes and extensions