Some faker fixes