Fixed Known Issues