Fixed number of issues, removed static references