Fixed various not updated code