Fixes for master