Ignoring https issues. Cleanups and fixes