fixing some common stuff.