Added FAQ fixes