* Fixed buld-time errors;