Live Server Testing Fixes