Various fixes after Reddit discussion