Multiple self-serve fixes