Devel - fixes