Fixes of unwanted IDE behavior