Adjustments to some misc features