Fixes

General fix of issues and improve configurations