Fixes from the May Barcamp

Fix several issues, starting from the barcamp until now...