Elkpr/425

A few fixes.