Some small fixes
Fixed makelists