Misc. fixes based on commments on related blog post