Fix size limits + new from miro