Last days bug fixes