Bug Fixes & Server Pass support