Fixed ridiculously painful dexed lib and dependency errors...