Junction13 specific fixes