Make µs support conditional and fix style