Little tweaks

Some small changes