Minor fixes & rebuilt shy