Fix issues from Javier