Tiny fixes & tuning