Little improvements

Some little improvements