Fix perimo issues