More updates/fixes