Bugs from landsacpe.io fixes