Small fixes, plans list