Micro cleanup
Several small fixes