Fix some bugs with job in queue (Not Built)