Tweaking some stuff