Some more functional changes