JS Callbacks fixed