Tweaks from setup at uStudio