Micro fixes