Minor fixes, new setup