Fix/build libs

As per Skype Conversation.