5min Fixes

From Krzysztof Starzecki  

views