Misc and small changes