Laruaville 3: Bug fixes

Fixed issues after purchase of Calendar