Correct property IDs, minor fixes