few last year fixes