Few small fixes which are really bugging me.