Fixes for https