Additional improvements and fixes