Fix target show issues