Misc modifications