Devel

Minor fixes