Fix Further Features