Fixes

Multiple fixes for future versions.