Fixed quickcall related issues