Some little improvements