Small improvements in methods