Minor, but important, design tweaks