Various improvments