more fixes for THUNK_SELECTORs