Best Day Ever: Little patch

Fix minors issues