Pushing changes

Pushing several fixes. See individual commit descriptions