Fix shortcomings