Final fixes for BlocksKit