small bug-fixes
Merge commit '2723bbef35a320c0914b801b01af2acb8aeb0467'