Small fixes to make runnable