Updates and fixes for backwards compatibility