A few small tweeks