Pending final bug fixes