Fixed various request issues