various micro fixes