Fixes for @radix's review