Fixed minor bugs in sunny
Merged sunny