Fixed issues related to the upcoming howto