Fix bugs after rebase
Fix bugs after rebase

walterbender/musicblocks,Hrishi1999/musicblocks,Hrishi1999/musicblocks,eohomegrownapps/musicblocks,eohomegrownapps/musicblocks,Hrishi1999/musicblocks,walterbender/musicblocks,eohomegrownapps/musicblocks,walterbender/musicblocks