Fixes, according to @blueyed comments