You know the drill ... more small fixes for small issues