Latest changes, basically just updating the projects to work again.

Signed-off-by: Michael Fabian Dirks <hellbirdxjun@gmail.com>