Fixed two issues with permanent properties running out