Minor fixes/setup