Some small tweaking