Some small tweeks