small perfs improvements