open source Fixes