More cleanup and small fixes fixes