Fixed some propprotection problems