ALiVE Changes / Fixes