Uncapping Initial and Trait Points

Fix for #5872