Fixed various calls